Close an api gap in tooltips

svn path=/trunk/; revision=19175

diff --git a/ChangeLog b/ChangeLog
index 3b545dd54a9c32ad40c45c6c9750c7de1feb2ad9..03de07a09a42aed8e800e12df602a6e93c5f034e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtk.symbols:
+       * gtk/gtktooltip.[hc]: Add gtk_tooltip_set_icon_from_icon_name().
+
 2007-12-14  Kristian Rietveld  <kris@imendio.com>
 
        * gtk/tests/liststore.c:

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 92fda0f96588a48c5f95e75ea3db0f0b4800f933..11ac490a50273199ef66114870d836b560b9208e 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -4181,6 +4181,7 @@ gtk_tooltip_set_markup
 gtk_tooltip_set_text
 gtk_tooltip_set_icon
 gtk_tooltip_set_icon_from_stock
+gtk_tooltip_set_icon_from_icon_name
 gtk_tooltip_set_custom
 gtk_tooltip_trigger_tooltip_query
 gtk_tooltip_set_tip_area

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 0910ff9f139094ad53c3188466ef4995ef4e1e5c..c928acfdb07087cf8f0bf2fe3668f838601a1835 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -4103,6 +4103,7 @@ gtk_tooltip_get_type G_GNUC_CONST
 gtk_tooltip_set_custom
 gtk_tooltip_set_icon
 gtk_tooltip_set_icon_from_stock
+gtk_tooltip_set_icon_from_icon_name
 gtk_tooltip_set_markup
 gtk_tooltip_set_text
 gtk_tooltip_set_tip_area

diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 56a944d00d9dd76ff39e453047dd156a1fab726e..762840374b26d873ec47052e232d428e6d215819 100644 (file)
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -274,7 +274,7 @@ gtk_tooltip_set_icon (GtkTooltip *tooltip,
 /**
  * gtk_tooltip_set_icon_from_stock:
  * @tooltip: a #GtkTooltip
- * @stock_id: a stock icon name, or %NULL
+ * @stock_id: a stock id, or %NULL
  * @size: a stock icon size
  *
  * Sets the icon of the tooltip (which is in front of the text) to be
@@ -298,6 +298,33 @@ gtk_tooltip_set_icon_from_stock (GtkTooltip  *tooltip,
     gtk_widget_hide (tooltip->image);
 }
 
+/**
+ * gtk_tooltip_set_icon_from_icon_name:
+ * @tooltip: a #GtkTooltip
+ * @icon_name: an icon name, or %NULL
+ * @size: a stock icon size
+ *
+ * Sets the icon of the tooltip (which is in front of the text) to be
+ * the icon indicated by @icon_name with the size indicated
+ * by @size.  If @icon_name is %NULL, the image will be hidden.
+ *
+ * Since: 2.16
+ */
+void
+gtk_tooltip_set_icon_from_icon_name(GtkTooltip  *tooltip,
+                                   const gchar *icon_name,
+                                   GtkIconSize  size)
+{
+  g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
+
+  gtk_image_set_from_icon_name (GTK_IMAGE (tooltip->image), icon_name, size);
+
+  if (icon_name)
+    gtk_widget_show (tooltip->image);
+  else
+    gtk_widget_hide (tooltip->image);
+}
+
 /**
  * gtk_tooltip_set_custom:
  * @tooltip: a #GtkTooltip

diff --git a/gtk/gtktooltip.h b/gtk/gtktooltip.h
index bc498af478c4b68c851603dfe492054733093326..5c29a9a5a5e349ea60b1e84837da524730bf713d 100644 (file)
--- a/gtk/gtktooltip.h
+++ b/gtk/gtktooltip.h
@@ -42,6 +42,9 @@ void gtk_tooltip_set_icon              (GtkTooltip  *tooltip,
 void gtk_tooltip_set_icon_from_stock   (GtkTooltip  *tooltip,
                                        const gchar *stock_id,
                                        GtkIconSize  size);
+void gtk_tooltip_set_icon_from_icon_name (GtkTooltip  *tooltip,
+                                         const gchar *icon_name,
+                                         GtkIconSize  size);
 void gtk_tooltip_set_custom           (GtkTooltip  *tooltip,
                                        GtkWidget   *custom_widget);